Merge from emacs-24; up to r110931
authorGlenn Morris <rgm@gnu.org>
Wed, 21 Nov 2012 04:47:55 +0000 (20:47 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 21 Nov 2012 04:47:55 +0000 (20:47 -0800)
commit718104a5594ae38a97ce3f2a1dd810d12e9ff637
treef00c1c99c06914c4247784e509b81fc82e8e0eaa
parentb382a63696f3941f207310576c1fe2edd3dc875b
parent22af2bfa746e4000fbafb25a40ac0cdd18a6b257
Merge from emacs-24; up to r110931
17 files changed:
ChangeLog
configure.ac
doc/emacs/ChangeLog
doc/lispref/ChangeLog
doc/lispref/os.texi
doc/lispref/windows.texi
etc/NEWS
lisp/ChangeLog
lisp/calendar/time-date.el
lisp/files.el
lisp/net/tramp.el
nt/ChangeLog
src/ChangeLog
src/emacs.c
src/fileio.c
src/w32.c
src/w32term.h